Install entry from 2001-11-20 that had unnoticed conflicts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c32bae6850fe0ee4703419a19833fed36f7f8c9..9301d007acf83fcb4a5806ae079e13bc3d7b9e5d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -99,6 +99,13 @@
 
        * replace.el (occur-mode): Undo 2001-5-20 change.
 
+2001-11-20  Jason Rumney  <jasonr@gnu.org>
+
+       * w32-fns.el (w32-system-coding-system): Change to an alias for
+       locale-coding-system.
+       (set-w32-system-coding-system): Document the above change.
+       Set locale-coding-system instead.
+
 2001-11-20  Richard M. Stallman  <rms@gnu.org>
 
        * ruler-mode.el: Add pagination.